bitkeeper revision 1.1159.1.494 (41c82fd4CRiE0gO721lqFijHEAIIxA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc xen/arch/x86/shadow.c
index 58a6fffdc489f8286765561e470d4cef8d0ee482,aa4afc3cda06c65a388259cc4a8a348601888bcc..0f66ca8cd0291db9d490d0537c72dda4cab86b02
--- 1/xen/arch/x86/shadow.c
--- 2/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@@ -533,16 -510,17 +533,16 @@@ static void shadow_map_l1_into_current_
  
          set_shadow_status(m, gl1pfn, PSH_shadowed | sl1pfn);
  
 -        l2pde_general(m, &gpde, &spde, sl1pfn);
 +        l2pde_general(m, &gpl2e, &spl2e, sl1pfn);
  
 -        linear_l2_table[va>>L2_PAGETABLE_SHIFT] = mk_l2_pgentry(gpde);
 -        shadow_linear_l2_table[va>>L2_PAGETABLE_SHIFT] =
 -            mk_l2_pgentry(spde);
 +        __guest_set_pl2e(m, va, gpl2e);
 +        __shadow_set_pl2e(m, va, spl2e);
  
          gpl1e = (unsigned long *) &(linear_pg_table[
-             (va>>PAGE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)]);
+             (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
  
-         spl1e = (unsigned long *) &shadow_linear_pg_table[
-             (va>>PAGE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)];
+         spl1e = (unsigned long *) &(shadow_linear_pg_table[
+             (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
  
          for ( i = 0; i < ENTRIES_PER_L1_PAGETABLE; i++ )
              l1pte_propagate_from_guest(m, &gpl1e[i], &spl1e[i]);

diff --cc xen/arch/x86/x86_32/mm.c
Simple merge